|#469|+Mridul| Grouping on approve and view. Final touches