Fix balance view and add of some indexes