Updated button alignment, table flow