Change bootstrap library to 2.3, minor renames
Refactor elements
Refactor