Removed aisle popup and added a bit of optimization