Update mixins, better display on tablets