Adding location - cleanup of dimensions so they are general and usable for tablet support.