Commit Collocation UI and some base activity change