Settings: Improve layout and toolbar