Adding closable tabs, still needs a little work