Changed layout
new style
fixed new style