Fix codings style
Merge branch 'Logic'

Implemented border control