#516 Added show / hide functionality