cleaned files
merge user view