styling changes and fixes