Fixed errors in the layout