[PATCH] Integrate scss updates and new assets to new layout