Cleaned up a lot of code, new shutdown modal