Removed master hide and show