Move buttons to better places