Add show-hide. #7 Various bug fixes
Merge branch 'bbq' into dev.

Close #7