Reintroduce borders, closes #6
Found a way to use tables