Add slim home and layout
fixed merge conflicts