Add more propper formatting to tables, split Client into parts