Feature/front improvements

Core part