display and form not hard coded anymore