styling fixes and improvements