Refactoring of assignments page