Add more UI element mappings