Moved resources, added modals