New dashboard template work in progress