Layout change and fixes