Fix Tab Issues