Reworked main submit form to make it prettier