Fixed unaligned button placements