Added base mixins and converted needed views to use them