Remove borders
More flat.
Merge branch 'qchan1/develop' into qchan1/beta