An Improved Convex Optimization Model for Two-Dimensional Facility Layout