new and fancy dashboard
merge