Visual changes, form fixes