Cherry pick site changes#2

osamaaamer95 wants to merge 2 commits into

thinblock:new_masterthinblock/tb-site:new_masterfrom

osamaaamer95:new_masterosamaaamer95/tb-site:new_masterCopy head branch name to clipboard