Adjust layout, update screenshot