Created macro files and made layout changes