Moving things around + fixes tables