More work on GUI design