refactored, bundles extended, modalwindow separated