Close button, Tab error fixed