Couple bug fixes.
Fixed some bugs with the components tab.
Merged the bug fix which I did too.