Added showing and hiding feature