Forgot one page...
Fixed button dimensions.  Again, DON'T ALTER!!! (keep mine not yours).
Merge remote-tracking branch 'Jason/master'