Modified tab wording, and update theme