Big UI changes, much more organized.