Attempted to fix annoyances with navbar