Further adjustments to new "main" app