Updated style
Updated style
Layout updates
Refactoring
Refactoring