actions fixed
Merge branch 'userspage'