Added Buttons and their functionality and fixed display
Merge pull request #1 from jonathanFinnell/master

Added Buttons and their functionality and fixed display