Clean Up Window Ordering

All to the front (remove Graph window code too)