Basic layout and manifest changes