Work on default theme, and tighten up overall system layout