Small changes in layout
Pull from master