Tweaked desktop form styles
Merge branch 'develop'