CAS-1425: cleaned up ui view handling and new ThemeBasedViewResolver