Component ScreenSwitcher done; Code cleaned