Update how baseapp is generated, some refinements to UI as well