Table improved
Changes in some elements