More work done on gui