optional image in layout

Also added a location line