Two click confirm system fix. Some fixes.
Small tweaks