Remove the border, it was tacky
Refactor for a bit more simplicity