Some small fixes about layer selection and spring configuration