Added base classes for some more screens, more components, bugfixes