Better graphic interface and bug fixes