Updated tables, updated look, updated alignment