added activity indicators and removed table selection