Fixes for planning view