Cleaned up some shit
Reworked a new window