Chnages to layout