Better handling of show behavior
Some refactoring renames