Fixed other bug and changed render order