Refactored WorkBoard