Some UI prep
Fixed merge