Revert "Modification in assign page"

This reverts commit 00615c3df04084a989acb4e8863132d47d702176.
all files merged and fixed