Small changes to fix show-hide