Fix candidate selection and a smaller layout map