Made bordered tables, next combine friendly names