Final UI changes

This puppy is production ready!