bunch of styling improvements