Added location to layout
Pending: Logic