Removed _ from tab name and fixed an annoying focus issue