fix date format
fix table layout