Aguila theme - varied components - QA fixes