GUI improve