New layout

all the changes