Fixed disappearing borders
Improved prompt