Some changes on frontend