Improved exam details
Merged some changes