Implemented Bootstrap 3, bug fixes