Some minor improvements in GUI