Added 'view as' feature