Button bugs fixed