new modal popup + changes to UI + other stuff
alefranz rules