Added ManageSourcesScreen, other misc fixes