usability and style fixes