Changing to more androidy style