Continue work on GUI