updated style/layout
fix mess