Simplified styling based on new inner-container and contents