Refactored new UI design using the new Section concept