Cleaned up screens, buttons, and icons.