UI layout resource cleanup

Progressive cleanup of ui resources.