Some refactoring on component storage and showing