get rid of multiple rows, more dynamic layout