added bootstrap
merge ui with master