New features and fixes for new UI layout