Minor evolution on GUI