Build, PRD-4380 and PRD-4500

Multi-build file no longer needs subfloor.
PRD-4380, PRD-4500: Small fixes for the formula editor.