Button textcolor, + misc

Few minor edits