A bit more responsive design