bootstrap and ui cleanup
merging gemfile locks