Uc fixes 1

Fixed errors around tabbed navigation