Corrected buttons widgets