Rearranged GUI in an own package
Fixing critical error causing upload to fail