Gave the main content window a border to align modules
Merge remote-tracking branch 'origin/master'