Updated activation/deactivation, updated graphics