Fixed a Problem, made a few UI changes.