Added new UI without separate panels