Update deps
Layout tweaks