Finished improving layouts
Merge and resolve conflict