restructure, move fns, open row at bottom