Layout changes and update to load into lollipop