update grading assessment layouts
refactor requirement form layout
fix merge conflicts