Cleanup whitespace above main content
Fix #141 and #142