fixed online list for users
removed old code
added analytics to layout
removed old files
merge conflict