More GUI changes

updated TODO