Added borders back
Closed #21