Make dashboard layout work better