Layout fixes
With icons!