e72a55f876
revert revert 6b997a69fe revert refactor(app): Some issues fixed
6b997a69fe
c486ee6b98
f0506dfe6c