Move app to extension!
Minor fixups.