More visual fixes

Brought the visuals/some button placements in line with the new specs