Changed file structure and table style
Fix linking
js cleanup