Cleaned up Navigation

And styling, needs more work but rough idea of what it will be like.