Created custom theme and started simplifying the view