Fixed FK
Tweaked table layout