#70 fix bug (collapsed-table cannot open)
Merge branch 'fit-to-smartphone'
#94 resolve conflict from #70