Responsive fixes for Joe Tamburro