Corrected errors in Top Menu
Merge pull request #58 from FWAJL/Development

Merge pull request #57 from FWAJL/master
Merge pull request #59 from FWAJL/Development

Development
Merge pull request #60 from FWAJL/master

Master to DEV