Layout changes

Done layout changes
Style

Changes