Altered table structure and layout