More fixes/ button placements