Reverted back from the single-app page until I get it to work better