Fix div alignment
Merge branch 'status_buttons'