Add location to Jerry #12
Fix grid layout