Some bug fixing
Working on the naming tables pages