More work on GUI