Added Image to listing of users + other little improvements