Hybrid cleanup (bootstrap.html removal), code review edits