set up base app view
fixed merge error