Added more support for UI and animation, changes to graphs