Improve container layout; fix 3 words