Revert "Tons of issues"

This reverts commit 0bf9b7cebb84513a9d299a248843761de1dbf268, reversing
changes made to 9759da3724ba19d23a12e6bc778fb907a601e941.
Border on Lightbox