realigned form elements a bit
removed some debug code