Optimize a little bit and update the dashboard to include selections.