incorporating claire's edits and reworking desktop grid