design changes, moved around table