Small tab overhaul to fix bugs