Dashboard prettier, history NPE identified