Styling changes, added form checking