Changed file system

Also bug fixes in GUI