Fixed html errors
Small change in table navigation
Fixed bug