Updated CMakeFiles to support new UI design