Improved the choose-your-components page layout