lots of layout and theme fixes