Cleaned up model

Hide many lines in the sub-components to make the model look cleaner.