Updated style and more
Added UML