css-improvements typescale and some variable cleanup