frond-end fixes