Trashed the window repositioning

Also still changing the way menus work