Merge "Yang UI - new features and fixes"