Updated with a function called by all buttons, code cleaning.
Re-Try last commit