layout changes and f2 implementation