Tidying things up on the button and the styleguide
Fixing merges and fixing addy's stuff - silly goose