fix containers
fix icons and transitions