changes CFR layout in accordance to UX specs
updates gitignore rules