Initial template checkin - bootstrap fixed