Fixes in SlimRoms navigtion bar implementation

Change-Id: I977f54c7a29c791b0b2b164992cf5f62ede39cc0