Work on buttons
Work on menus
Merge pull request #27 from jetty840/dcnewman-merge

Dcnewman merge