Fix categories ordering issues, order step 2 issue and other graphical changes.