Fix Bug 962905, add border box and other small adjustments

@rtucker r? I do not have a DB export so, this was tested in dev tools but, I am sure this will solve the problem. If it does not, let me know and I will get the needed export so I can run this locally and test.