Fixed control page bugs