added files and user overview implementation
resolved conflicts