First commit
Changes to BorderForm
Changes to BorderForm
@Hack