Added stuff on layout etc