Merge pull request #1 from prominal/master

Added buttons and prettify