Small fixes
Fix up table view