started working on bootstrap correctly
more changes