Moved buttons around to match layout