Initial redesign of android app