fix non-div display
comment out breakpoint logger for now
Merge branch 'master' into gh-pages