Added borders and max zoom