UI revamp
Include hashcode/equals/creator