Fine tune UI for iOS7; Modify code style