Improved spacing and removed db reference
Added form library
Used form library