Small UI fixes

Ghost User requested to merge am-ui-fixes into master

Merge request reports