Fix various UI/composer issues