UI Updates

UI Updates Merge