small view changes
small view changes
Refactoring code