(Frontend) improvements
[ci skip]