Improved user interface when using nested states