Sorted out more component positions