modified structure. only sass left. some styles improved.