Fixed Dependencies
Updated Window