Environment banner added & few fixes