Added ui-design branch changes