big update of layout and style