Layout freshened to include standard button layout. Fall-behind Add Plugin dialog also fixed. (cherry picked from commit 30dac89)