Fix UI errors
Finalize the user-timeline
Fix merge conflicts with SG-UI