fixes #3291 Tab order on Add Container page is out of order

Fixed and pushed the code for review, please check it.