Mostly UI changes, going to switch everything over to tabs