Further modifications to settings, layout and authentication