cleaned up navbar code