Redid layout to fix startup crash
Also added some manifest metadata.