Updated manifest layout and such