Merge pull request #24 from Callum-/master

x
Added menu entries and functionality
Merge pull request #25 from Callum-/master

pushing so ican merge
Menu Fix
Further changes