merged with row-fluid and alt changes as part of homework 7