Cleanup and chrome background fixed fix