finally cleaned up the borders
Merge branch 'capright' into testing