Changed to task disabling instead of deleting, and added empty layout