Updated some variables. Fixed form order