navbar working cleaned up code