Refactor, cleaning up
Updated Base template: Bootstrap2 to Bootstrap3