customized forms /clean-up

code/icons/forms etc.