Fix app.net code layout when it has content, miscellaneous layout tinkering