Update buttons in container
Remove warnings
Test all-in-one