refactored, added sm and xs views