overhauled naming of css ids and classes