Update button order and spacing