More XML tweaking. Overall more visually clean. More settings available in SettingsPopup.
Merge commit 'a9d8ceb961ed259d5efaef3cc1ace954dd9a8342'