Actually fix the navbar stuff this time?