Tidied up buttons and started add mixin functionality