Fix button style wrapper and props passed

Fix button style wrapper and props passed #60