Bootstrap 3 and UI improvements