major layout changes, changed to bootstrap