UI tweeks
Fixed merge