Made borders into objects instead of hardcodes