Fixed UI to Open & Close Properly