changed wrapper
fixed buttons for 8.1
fixed buttons for 8.1