User managment GUI update
Merge remote-tracking branch 'upstream/master'
Tabs margins
Merge pull request #208 from solispauwels/master

User managment GUI update