Fix #196 (Reorganize top bar buttons)
Move settings button to the right of sidebar