Updated to Unify GUI