Fix Bug 944699, fix responsive bug related to new layout

@erikrose r?