reworking to fit new structure and css