student and userdashboard modal spacing
userdashboard edits
merge conflict resolve