Add swap module
Remove depreciated HTML
Change order or items