Fix show functions and container hierarchy