Added RiskByEvent and Positions screens. Tidied up data format.