Optimised the Android app