Minor fixes to the flow of the components.