did some modification on the goal first form layout