Major cleanup, switch to Bootstrap