GUI improvement
