changes for design and popup
last changes for design
start!