Refactoring and bug fix

Jenkins Lint Issues: removed some hardcoded stuff, new structure of
layout file, wrong value: DEFAULT_INACTIVE_BLACK_KEY