Switched to using show-hide component