Place buttons more intuitively
Tweak buttons again