Updated with Bootstrap 3

Things are much cleaner now.