Container styling and code cleanup