First commit with HTML 5 templates and few features removed/changed