Update scale class and list layout
Rebuild styles
Remove merge conflict