Vishnu - Mode a few small UI fixes
Resolving merge issues.