Changed folder structure, added buttons to pop-up