updated files with Amy's changes (mainly CSS)