Improve tab + new plan formatting