refactored again project architecture and also that only last X measures
are displayed