Big update to some css, js logic and labels etc