Android Fix and IOS design change