Fixes for navbar