Added tabs and logic-in-html