First Release, Bugfix + Location set form close back to main