improve style
change layout