refactoring
work on slave market screen