Further Modifications to Android App

Further modifications, work in progress