Fixes for new dashboard layout