Markup&css refactoring
New measurement collection timeout and Measurement model