refactored, added sm and xs views
refactored, added sm and xs views