fixed naming convention and container width