Some design refactors, abstracted handler entity, dashboard fixes