Update manfiest and fix buttons