Some updates
Corrected ToFront