Update app layout, match with skeleton