Merging new SOTN hover abilites/new page into master