fixed heading and subheading borders
fixed bugs in staging branch