reformating layout and move historical data to viewmodel/dynamics