organized layout elements roughly by views, added several new ids/classes, etc