Final design commit
last changes before release

last changes before release