solving conflicts
move assets to public (rest of views)