Layed base framework for components on the front-end;
Fixed merge conflicts;