Some frontend changes