Separated view, updated theme file