lots of changes
added bootstrap