Started work on the UI