Updated with responsive design