More work on GUI framework