changed website structure and removed defaults