Use new options in the dashboard box
Fix checkstyle warnings