Fixed form's border size. Improved form's width and height calculation