Visual form fixes