adjust styles to Modern UI like style [WIP]