expanding use of bootstrap, cleaning up styles