Fixing Navigation/Tabpanel Bug