Feature/frontend adjustments