Small fixes.
Migrated to the usage of ViewGroup.