Add enabling and disabling logic for display