modify UI
install bootswatch
Fix conflicts
merge