change structur and add styles