Refactoring of the Scaffold for use beside Controls

Started testing the ModelProvider