Harry: added in a few dropdown menus
Merge branch 'dev' of https://github.com/FCPDIT/TeamProject.git into dev