Fixed borders - final commit