Revamped User Management page

Please review for correct markup and merge. Thank you!
Same here.