Updated form and admin pages