angshu | minor changes in app framework