Adding content to modal pop ups. some code cleanup