fixing up deps
renaming common views