Add enhancements, improve look