Layout and manifest updated