Fixed form submission and design bug