Fix alignment
Solution adjustments
Update readme and diagrams