Style additions and fixes