Reorganize top bar buttons