Refatoring UI code heavily and updating React to v15.6.1 (preparing for v16) before next step merging new features.