Redid drawing order so tab makes more sense