Refactored container div to allow more flexibility