updated mixins and cleaned up front