fixes and dyanmic cell heights first draft