Improved bootstrapping, moved modal to user UI