Feature/front end fixes