Make navbar more usable while collapsed

Change-Id: Idf778ff954f62656f3da704577e24116e2817ecd