Cleaned up theme, menus