Updated feature and added view mode switching logic