Improving settings acivity display and behaviour