Continued work on the UI