Merge pull request #22 from chinmaydd/master

Button problems fixed, added back links for some views