Changed layout and pics