added changes from testing branch (ugly user-status for online users)