Merge pull request #1863 from ssushma/dev-branch

unit title will appear on the top
Assignment not available text not appearing issue resolved