Improve form input layout and classes