Layout, new forms, removed highcharts