Updates layout
Removes unused dependency