Made some changes:
The frame is now the border