Fixed tab issues (once and for all)