Tightedn up buttons, added more mixins, getting ready for v2 launch