Fixed further Tab Issues