Merging menupage code in. 

Hannah and I should be up to date after this. We should talk about creating our own branches/workflow before either of us commits more to the remote repository.