Reworked component displays.. added tabs to org display