fixed layout bug when no filter by menu is present
Merge remote-tracking branch 'origin/master'