added bootstrap to ui
merged code