fixed buttons issues