[FEATURE] Make sure the top navigation bar is always visible

Change-Id: I615507c7910cb00bfb036a25954eb10f7b5f660e
[CLEANUP] Remove obsolete comments

Change-Id: I432ad9598744f57d55e36412cda81669fe33584f