Adding some category navigation, cleaning up some category stuff