Button properties fixes