Add solution to #26
Add solution to #97
Fix hanging tabs