More work on the new GUI