Adding some border extends and cleaning things up accordingly

@ajself @darbyfrey #coderetreat