more dom changes(making templates as similar as possible) and corresponding scss changes