Add padding to bounding box for initial zoom, some cleanup