Refactored contentbox