New design on forms + code cleaning