GUI enhanced