Inner page cleanup
Inner page cleanup
Merge pull request #97 from timhobert/themeup2

More theming