Initial commit + gui bugfix