Merge pull request #618 from robertdown/main-frame-border-removal