Couple tweaks to toggles for hiding based on state and status; added more states/statuses