Fixed dangling components

Some things wrapped unusually
I believe its ready to submit