cleanup layout a bit; added form validation; manual refresh