updated menus and font
merging
Merge branch 'master' of https://github.com/jlastrachan/ServeUs
correcting linking