some changes and restructured table elements