updated layout and deleted old includes