Changed layout, added scss