WIP - Fix load window