Fixed plotting issues.

And improved UI design.