Added UML and tweaked UI