Improve plan and show spot page