Lots of misc. work on dashboard page