Upgraded Button to new design pattern

Also tidied up line lengths to be < 80 chars.