More work on GUI overhaul