Trying to make buttons look like buttons.  Some refactoring