Small tweaks and added toggle with X

Still debugging why the checkmark isn’t working.