BASIC-694 | Display Suite View Mode Clean Up