Refactored labels mechanism
Refactored view models