More layout changes

+ removed settings page