Merge branch 'new_panels' into locationlistview