Changed table style, filenames
changed more filenames