a bit of refactoring; dashboard/timeline added