Feature/front end improvements