Reordered elements on dashboard
resolved merge conflict