Refactored to divs