Updated to Bootstrap 3

Various other updates,