Adding bootstrap, and doing a little cleanup