Adapting the SAO UI, various fixes