modified template structure and Bootstrap layout