Finalise Exam UI and Controller added
merge conflict resolved