Making border (done)
Revert "Making border (done)"

This reverts commit 114ff9dbe0f50a85edf0e99f9f93b1a1433b86a9.
Revert "Revert "Making border (done)""

This reverts commit 4be8610d92f72f318a08af75badb85c6fc025be7.