Fix f1s layout; closes #3