bug fix, manual tweaks to layout