Fixed errors introduced while moving the components