Duplication bugs fixed

Duplication bugs fixed and table layout applied