Bug fix and perf [FXOS-198] Dark layer