Feature/improve site