Re-worked the navbar