fixed the display of plans so the html is not broken
small fixes on the texts of controls
changes on the schema