Re-did functions for changing windows
Tried some more tricks to fix display bugs

There are still a few things that are showing up when they shouldn't on
Mac