updated design and layout
more layout changes