Updates to match FxOS UI