Content and container size fixes