labels refactoring
layout redesign
layout test