dashboard templated adjusted
UI adjusted