fixes and updates not implemented in the first merge in JS files
updates in images not commited before the merge
Bootstrap added and all SCSS files updated