Better modal controls and structure