Satya - Bug Fixes

Submitted screen modifications