Some Cleanup
Cleanup
More Styling cleanup. A couple bug fixes, removed closing tag to prevent empty space being injected