started to cleanup all templates and bootstrap-markup