Re organized and Nav bar
Nav bar