More changes

Everything is hidden under user_activity