Panel loc

Long since time to merge to master