Use show/hide methods instead of add/remove class