Small changes in frontend