use eager loading, add indices, fix some styling