Removed some unused modals
Merge origin/master
Fixed a problem with layout.
Added code for retrieving collected users and expose them.
Merge origin/master