Bug Fixes and adding Users-Button