removed some stuff from form, put into the page itself