Updated all views to inherit from Base View