Small changes in filling layout
Pull from master, conflict