Really fixed the border now