fixes for styling and mixins