cleanup of navbar and namechange to index