upgrade bootstrap, rearrange layout