Fixed the button placement and dropdown issues.  Ready for Review and Merge