Move Layout into ScrollView and Add Track Property section