Added 1 and 2 row layout options and improved text collection