Merge pull request #1885 from ssushma/dev-branch

unit setup header consistency implemented.
required and optional tickmark issue resolved on unit setup page.