Moved windows to the custom gui system
Fixed some odd behaviour with the windows
Some more gui behavioral tweaks and bugfixes