Table changes + fixed layout for dialog