Fix for 'Components' and 'Software' tabs not displaying their contents.

Also, reverted some changes introduced in #1057 + made some further
cleaning related to spurious views.
Merge pull request #1068 from xor-xor/tabs

Fix for 'Components' and 'Software' tabs not displaying their contents.