Improved layout and background theming