better mixins, restructuring, better buttons...