Improved listing and added different modes in grade view