Few More Updates to the Android App

Work in Progress!