Close Tab & Focus Fix

Resolve #6
Resolve #12