ui updates, integration
Small changes