Final Data change and Style change

Final Data change and Style change