Fixed button rendering
Fixed mac bugs