Restruct view model
Define CloseButtonStyle
Update CloseButtonStyle