Fixes to bootstrap for Windows servers, moving much of the layout logic out of Controller into LayoutManager