headline-frame bugfix, improve code readability