[PATCH 4/4] merged few items from custom.scss to layout.scss