adding some updates for different views. Fixing Currents Issues.