Fixes border size, and where they show... Working on warnings