Feature/front improvements