Enhanced GUI