Firefox OS charts added, code needs cleanup