Fixes for Merge issues
Removing UI from master for now
AWRC UI import