Removed hiding on close instead of closing
Minor changes