Merged with V1 new UI
V1 with spaces deleted