Move oauth url making routine to account object
Use app entity instead app/layout to set layout