Updated GUI Code