basic form and container changes