Cleaned up some code and added navigation links

I removed some unused code and changed some of the syntax to my liking.