Update: Desktop - Users: Changed to titleBorder instead of jlabels for inputfields. Also changed to titleBorder to Inventory and Website. 
Changed row height in several places, all text should be readable now.
Merge origin/master