design refactored for dashboard and entires