Multiple UI and behavior changes
Merge