upgraded bootstrap, fixed layout