Fix plan spot page
Merge branch 'dev'