Minor changes on frontend