Merge branch 'remove-ffs' into 'master'

Removed all "ffs" from layouts

See merge request monero-project/ccs-proposals!23