fix layout breaking when toggling border (#1346)

* fix layout break when toggling border

* cleanup

* restore whats been removed for testing purposes

* only manuall scroll on border section open

* duplicate

* -___-

* ts

---------

Co-authored-by: Brendan Allan <brendonovich@outlook.com>

Author: ameer2468