More work with gui