Big UI changes to project