Add score calcultaion, general ui improvement