Fixed button style, and added inputs