Minor enhancements, some styling