Layout change and update to .8