cosmetic changes and tab order fix