renaming, added new models. cleanup. css