Minor layout changes and js validation.