Updated and Changed layout