refactor, added borders

refactoring and adding borders, not happy with 0 and 00 yet