Rev 3 - Fixed display in user view