More work on GUI, icons and stuff