Fixed up form and further work on party details