More work on gui