fixes issue of divider lines disappearing on screen 2
Merge remote-tracking branch 'origin/master'