App options

Resolves #1536