refactor some css and try to be more consistent with filenames