Continued work on the design + UI