Merged panel/border with panel/
Finished most of border logic