added bashboard view condition check- Manli