Added border-style editor, added border colors
Tweaked page layout
Template updates