redesign, cleanup, bootstrap3