Remove obsolete code
Standardize all top menu links
Merge pull request #92 from PowerKiKi/cleanup

Clean up old code and standardize links