Changed submit input to a button
Code cleanup