UI Changes / Bug Fixes

Various UI / Bug fixes throughout program