Improvement to gui