Fixed UI issues
Fixed UI issues
fixing merge issues