Minor GUI changes from Udi+Yaniv