reorganized navbar and bettered code styling