user list & actions fixed
merge with master