[cssBranch] 99% finished with the design, going to get last changes from master before finishing.