HAL-152: Move form buttons to the bottom