Integrate event list in profile and cleanup html
Merge branch '1-3' into dev