fixed up components tabbing