Added more borders n stuff